add toBuilder method on some models #766

channel-dante · 2023-12-12T04:58:22Z

Description

added toBuilder method to all request model in core package & _types.query_dsl package
for consistent model management, add to all related models rather than just a specific model.

Issues Resolved

[PROPOSAL] support rebuild or deep copy on SearchRequest.Builder #583

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

dblock · 2023-12-12T14:00:26Z

This looks good. Any way we can get some test coverage here on these other classes? I understand it's laborious (hence we should be investing in a code generator).

channel-dante · 2023-12-13T00:48:15Z

This looks good. Any way we can get some test coverage here on these other classes? I understand it's laborious (hence we should be investing in a code generator).

@dblock I'm curious what you want to test. Can I just test whether toBuilder works (like this)? Or do you want to verify that all fields operate normally? If you want a second one, it won't be an easy task.

dblock · 2023-12-13T16:10:36Z

This looks good. Any way we can get some test coverage here on these other classes? I understand it's laborious (hence we should be investing in a code generator).

@dblock I'm curious what you want to test. Can I just test whether toBuilder works (like this)? Or do you want to verify that all fields operate normally? If you want a second one, it won't be an easy task.

I'm good with anything that just exercises the code to start.

channel-dante · 2023-12-18T04:09:41Z

@dblock Can you please review again? It was a very laborious task 😅

dblock

Looks good to me! Nit on CHANGELOG.

Thank you for doing this. I recommend investing more time in code generation so we don't have to do this by hand :)

dblock · 2023-12-18T15:31:02Z

CHANGELOG.md

@@ -39,12 +39,15 @@ This section is for maintaining a changelog for all breaking changes for the cli
 - Added support for icu_collation_keyword type ([#725](https://github.com/opensearch-project/opensearch-java/pull/725))
 - Added support for flat_object field property ([#735](https://github.com/opensearch-project/opensearch-java/pull/735))
 - Added toQuery method in Query and QueryVariant ([#760](https://github.com/opensearch-project/opensearch-java/pull/760)
+- Added toBuilder method to all request model in core package & _types.query_dsl package


Add a link to the PR like other lines.

dblock · 2023-12-18T15:32:25Z

@VachaShah @reta Any ideas of how to do this kind of change better?

VachaShah · 2023-12-18T22:29:21Z

@VachaShah @reta Any ideas of how to do this kind of change better?

I think for changes like these which span almost all files, code generation is the way to go. If we have some code which can incrementally add such methods (even if it is not a complete code generator for the client), it would be beneficial to add features like toString and withJson.

VachaShah

This is great! Thank you @channel-dante for adding this along with the tests!

reta · 2023-12-19T01:30:40Z

@VachaShah @reta Any ideas of how to do this kind of change better?

Agree with @VachaShah , having code generation in place would make it much simpler ....

Signed-off-by: channel-dante <[email protected]>

…ypes.query_dsl Signed-off-by: channel-dante <[email protected]>

Signed-off-by: channel-dante <[email protected]>

VachaShah

LGTM, thank you @channel-dante!

opensearch-trigger-bot · 2024-01-02T20:03:33Z

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-766-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 a8fea24a626485173c870e220731e15482f1ab94
# Push it to GitHub
git push --set-upstream origin backport/backport-766-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-766-to-2.x.

dblock · 2024-01-02T21:41:03Z

@channel-dante you should backport this manually to 2.x so we can release it with the next minor

* add toQuery() on SearchRequest Signed-off-by: channel-dante <[email protected]> * add toBuilder() on all Request in org.opensearch.client.opensearch.core Signed-off-by: channel-dante <[email protected]> * add toBuilder() on all Builder in org.opensearch.client.opensearch._types.query_dsl Signed-off-by: channel-dante <[email protected]> * update CHANGELOG.md Signed-off-by: channel-dante <[email protected]> * apply spotlessApply Signed-off-by: channel-dante <[email protected]> * fix CommonTermsQuery.toBuilder() Signed-off-by: channel-dante <[email protected]> * fix FuzzyQuery.toBuilder() Signed-off-by: channel-dante <[email protected]> * fix toBuilders Signed-off-by: channel-dante <[email protected]> * add test for _types/query_dsl package Signed-off-by: channel-dante <[email protected]> * add test for core package Signed-off-by: channel-dante <[email protected]> * spotlessApply Signed-off-by: channel-dante <[email protected]> * fix test Signed-off-by: channel-dante <[email protected]> * revert ModelTestCase Signed-off-by: channel-dante <[email protected]> * revert ModelTestCase Signed-off-by: channel-dante <[email protected]> * add pr link on CHANGELOG.md Signed-off-by: channel-dante <[email protected]> * add pr link on CHANGELOG.md Signed-off-by: channel-dante <[email protected]> * apply spotless Signed-off-by: channel-dante <[email protected]> --------- Signed-off-by: channel-dante <[email protected]> (cherry picked from commit a8fea24) Signed-off-by: channel-dante <[email protected]>

* add toBuilder method on some models (#766) * add toQuery() on SearchRequest Signed-off-by: channel-dante <[email protected]> * add toBuilder() on all Request in org.opensearch.client.opensearch.core Signed-off-by: channel-dante <[email protected]> * add toBuilder() on all Builder in org.opensearch.client.opensearch._types.query_dsl Signed-off-by: channel-dante <[email protected]> * update CHANGELOG.md Signed-off-by: channel-dante <[email protected]> * apply spotlessApply Signed-off-by: channel-dante <[email protected]> * fix CommonTermsQuery.toBuilder() Signed-off-by: channel-dante <[email protected]> * fix FuzzyQuery.toBuilder() Signed-off-by: channel-dante <[email protected]> * fix toBuilders Signed-off-by: channel-dante <[email protected]> * add test for _types/query_dsl package Signed-off-by: channel-dante <[email protected]> * add test for core package Signed-off-by: channel-dante <[email protected]> * spotlessApply Signed-off-by: channel-dante <[email protected]> * fix test Signed-off-by: channel-dante <[email protected]> * revert ModelTestCase Signed-off-by: channel-dante <[email protected]> * revert ModelTestCase Signed-off-by: channel-dante <[email protected]> * add pr link on CHANGELOG.md Signed-off-by: channel-dante <[email protected]> * add pr link on CHANGELOG.md Signed-off-by: channel-dante <[email protected]> * apply spotless Signed-off-by: channel-dante <[email protected]> --------- Signed-off-by: channel-dante <[email protected]> (cherry picked from commit a8fea24) Signed-off-by: channel-dante <[email protected]> * removed not related test code Signed-off-by: channel-dante <[email protected]> --------- Signed-off-by: channel-dante <[email protected]>

channel-dante requested review from reta, Bukhtawar, dblock, szczepanczykd, madhusudhankonda, saratvemulapalli and VachaShah as code owners December 12, 2023 04:58

channel-dante force-pushed the to-query-for-search-request branch 2 times, most recently from 85daea3 to 344d8ae Compare December 12, 2023 05:33

channel-dante force-pushed the to-query-for-search-request branch 5 times, most recently from d897a81 to eea2804 Compare December 18, 2023 03:29

dblock previously approved these changes Dec 18, 2023

View reviewed changes

VachaShah previously approved these changes Dec 18, 2023

View reviewed changes

channel-dante dismissed stale reviews from VachaShah and dblock via 7549084 December 19, 2023 01:59

channel-dante force-pushed the to-query-for-search-request branch 2 times, most recently from aebc5f5 to df61786 Compare December 19, 2023 04:35

channel-dante requested a review from dblock December 19, 2023 05:29

dblock previously approved these changes Dec 20, 2023

View reviewed changes

channel-dante requested a review from VachaShah December 21, 2023 07:42

channel-dante added 17 commits January 2, 2024 09:07

add toQuery() on SearchRequest

37256fa

Signed-off-by: channel-dante <[email protected]>

add toBuilder() on all Request in org.opensearch.client.opensearch.core

89497be

Signed-off-by: channel-dante <[email protected]>

add toBuilder() on all Builder in org.opensearch.client.opensearch._t…

28ef294

…ypes.query_dsl Signed-off-by: channel-dante <[email protected]>

update CHANGELOG.md

98b4e46

Signed-off-by: channel-dante <[email protected]>

apply spotlessApply

4ce9471

Signed-off-by: channel-dante <[email protected]>

fix CommonTermsQuery.toBuilder()

046e467

Signed-off-by: channel-dante <[email protected]>

fix FuzzyQuery.toBuilder()

f13dd48

Signed-off-by: channel-dante <[email protected]>

fix toBuilders

7d2cdaa

Signed-off-by: channel-dante <[email protected]>

add test for _types/query_dsl package

486678c

Signed-off-by: channel-dante <[email protected]>

add test for core package

525bac2

Signed-off-by: channel-dante <[email protected]>

spotlessApply

1ab16ad

Signed-off-by: channel-dante <[email protected]>

fix test

cd6ad24

Signed-off-by: channel-dante <[email protected]>

revert ModelTestCase

124aa85

Signed-off-by: channel-dante <[email protected]>

revert ModelTestCase

3309526

Signed-off-by: channel-dante <[email protected]>

add pr link on CHANGELOG.md

6ae86c3

Signed-off-by: channel-dante <[email protected]>

add pr link on CHANGELOG.md

a77ea50

Signed-off-by: channel-dante <[email protected]>

apply spotless

66c2454

Signed-off-by: channel-dante <[email protected]>

channel-dante force-pushed the to-query-for-search-request branch from cbceb9d to 66c2454 Compare January 2, 2024 00:07

channel-dante requested a review from dblock January 2, 2024 00:17

VachaShah approved these changes Jan 2, 2024

View reviewed changes

dblock merged commit a8fea24 into opensearch-project:main Jan 2, 2024
46 checks passed

dblock added the backport 2.x Backport to 2.x branch label Jan 2, 2024

channel-dante mentioned this pull request Jan 3, 2024

[Backport] [2.x] add toBuilder method on some models (#766) #797

Merged

channel-dante deleted the to-query-for-search-request branch January 3, 2024 04:06

ls-urs-keller mentioned this pull request Jan 19, 2024

Add wrapper to builder ls-urs-keller/opensearch-java#1

Closed

BrendonFaleiro mentioned this pull request Jun 21, 2024

2.x #1045

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add toBuilder method on some models #766

add toBuilder method on some models #766

channel-dante commented Dec 12, 2023

dblock commented Dec 12, 2023 •

edited

Loading

channel-dante commented Dec 13, 2023 •

edited

Loading

dblock commented Dec 13, 2023

channel-dante commented Dec 18, 2023

dblock left a comment

dblock Dec 18, 2023

dblock commented Dec 18, 2023

VachaShah commented Dec 18, 2023

VachaShah left a comment

reta commented Dec 19, 2023

VachaShah left a comment

opensearch-trigger-bot bot commented Jan 2, 2024

dblock commented Jan 2, 2024

add toBuilder method on some models #766

add toBuilder method on some models #766

Conversation

channel-dante commented Dec 12, 2023

Description

Issues Resolved

dblock commented Dec 12, 2023 • edited Loading

channel-dante commented Dec 13, 2023 • edited Loading

dblock commented Dec 13, 2023

channel-dante commented Dec 18, 2023

dblock left a comment

Choose a reason for hiding this comment

dblock Dec 18, 2023

Choose a reason for hiding this comment

dblock commented Dec 18, 2023

VachaShah commented Dec 18, 2023

VachaShah left a comment

Choose a reason for hiding this comment

reta commented Dec 19, 2023

VachaShah left a comment

Choose a reason for hiding this comment

opensearch-trigger-bot bot commented Jan 2, 2024

dblock commented Jan 2, 2024

dblock commented Dec 12, 2023 •

edited

Loading

channel-dante commented Dec 13, 2023 •

edited

Loading